demo: Update to gesture widget-level API changes
authorCarlos Garnacho <carlosg@gnome.org>
Tue, 8 Apr 2014 18:59:16 +0000 (20:59 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 23 May 2014 17:54:25 +0000 (19:54 +0200)
demos/gtk-demo/gestures.c

index 28db04f49f7f15d656cde375bd8945dbd3abbd95..387e357b6c0d204d868454888d404271bbdf40e8 100644 (file)
@@ -156,7 +156,8 @@ do_gestures (GtkWidget *do_widget)
       gesture = gtk_gesture_swipe_new (drawing_area);
       g_signal_connect (gesture, "swipe",
                         G_CALLBACK (swipe_gesture_swept), drawing_area);
-      gtk_widget_add_gesture (drawing_area, gesture, GTK_PHASE_BUBBLE);
+      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_unref (gesture);
 
       /* Long press */
       gesture = gtk_gesture_long_press_new (drawing_area);
@@ -164,19 +165,22 @@ do_gestures (GtkWidget *do_widget)
                         G_CALLBACK (long_press_gesture_pressed), drawing_area);
       g_signal_connect (gesture, "end",
                         G_CALLBACK (long_press_gesture_end), drawing_area);
-      gtk_widget_add_gesture (drawing_area, gesture, GTK_PHASE_BUBBLE);
+      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_unref (gesture);
 
       /* Rotate */
       rotate = gesture = gtk_gesture_rotate_new (drawing_area);
       g_signal_connect (gesture, "angle-changed",
                         G_CALLBACK (rotation_angle_changed), drawing_area);
-      gtk_widget_add_gesture (drawing_area, gesture, GTK_PHASE_BUBBLE);
+      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_unref (gesture);
 
       /* Zoom */
       zoom = gesture = gtk_gesture_zoom_new (drawing_area);
       g_signal_connect (gesture, "scale-changed",
                         G_CALLBACK (zoom_scale_changed), drawing_area);
-      gtk_widget_add_gesture (drawing_area, gesture, GTK_PHASE_BUBBLE);
+      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_unref (gesture);
     }
 
   if (!gtk_widget_get_visible (window))